async def _server_lifespan_cycle(self):
     try:
         await self._connect_to_server(self._transport_context_factory(self.server_config))
-    except* HTTPStatusError as e:
+    except HTTPStatusError as e:
         if isinstance(self.server_config, RemoteServerConfig):
             logger.warning(f"Failed to connect to server {self.server_config.name} with streamablehttp, try sse")
             await self._connect_to_server(_sse_transport_context(self.server_config))
         else:
             raise e
-    except* Exception as e:
+    except Exception as e:
         logger.error(f"Failed to connect to server {self.server_config.name}: {e}")
         self._initialized_event.set()
         self._shutdown_event.set()

 tool_name = tool.name
 if tool_name in self.capabilities_to_server_id["tools"]:
     if self.on_name_conflict == "strict":
         raise ValueError(
             f"Tool {tool_name} already exists. Please use unique tool names across all servers."
         )
     else:
         # Auto resolve by adding server name prefix
         tool_name = f"{server_id}{TOOL_SPLITOR}{tool_name}"
+        tool = tool.model_copy(update={"name": tool_name})
 self.capabilities_to_server_id["tools"][tool_name] = server_id
 self.tools_mapping[tool_name] = tool